Rogue

See system 6 rogue. Pretty much perfect.

Add the 5e cunning action stuff.

Warlock

Summons, souls, rituals.

Bindings as a core feature.

Fighter

Weapon specialization, etc

Paths

Have 'em?

Warlocks and Witches

Soul = identity

Shadow = insanity, fear, tentacles, etc

Witches pretty much just have blood. Shadow is an overlap with warlocks, frost with druids, mind with priests. Hmm....